bitkeeper revision 1.1159.1.447 (41a4df5fq9WruAfvB3NCsqYGHixNRg)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 24 Nov 2004 19:22:07 +0000 (19:22 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 24 Nov 2004 19:22:07 +0000 (19:22 +0000)
Merge arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen.bk-smp
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen.bk-smp-public


Trivial merge